projects
/
xen.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9ed606a
fcf68ac
)
bitkeeper revision 1.1389.1.39 (4280b9edgpXcv7Ln0ytJwS4QaBJdSg)
author
cl349@firebug.cl.cam.ac.uk[cl349]
<cl349@firebug.cl.cam.ac.uk[cl349]>
Tue, 10 May 2005 13:41:01 +0000
(13:41 +0000)
committer
cl349@firebug.cl.cam.ac.uk[cl349]
<cl349@firebug.cl.cam.ac.uk[cl349]>
Tue, 10 May 2005 13:41:01 +0000
(13:41 +0000)
Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk
1
2
linux-2.6.11-xen-sparse/arch/xen/i386/kernel/smpboot.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
linux-2.6.11-xen-sparse/arch/xen/i386/kernel/smpboot.c
Simple merge